Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Wed, 31 Jan 2007 17:22:17 +0000 (17:22 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Wed, 31 Jan 2007 17:22:17 +0000 (17:22 +0000)

Trivial merge